toggle fix
Merge branch 'master' into cecep