Fixed bugs with set checker