Adding check for checkboxes bug 1451

Signed-off-by: Arpit Goyal <agmps17@gmail.com>