Fix backswap, drop and refill
Fix backswap, drop and refill