Attempt to fix repeated adding of velocity.

Effects on hacks have to be evaluated further.