Fixed problem when removing last