Task #1 fixed