Fix popping bug