Fixed #7, hopefully