Feature/iteration 4 dev check all fixed

Fixes the check all bug.