Fixed problems with gen move.