Tasks 1.6, 3.5, 3.6
small fix to 3.6