Task04 fixed