Fixed #5 hopefully