Fixed #67 (hopefully).