last commit introduced a really extrange bug (things suddenly dissapear or no motion)