fixing it :P (and improving a bit) | ScratchStats