Bug fix
Made onDraw-method more memory efficient