Fix #3: Revert back to correct the checkbox change