Fixed #2 complete