Fix #61