Fix #74