Fix #62