Fix for manual checkbox/label