Added unchecked handler to fix checkbox bug