Fix the removed option bug