Fixed #74