Fix broken remove_single