Fixed #11 worked on #10