Fixed bug
Done task (c) 1.-3.