added fix for second checkbox