Fix no drop
-add lastmap