Fix #60