fixed task 01, 04