Fixed a issue with removecaptain