#34 fix task