Fix #57