Fix #69