Fixed issues related to checkbox