Fix floating block bug
Fix pop