Fixed #10 hopefully