Fix checkbox allocation