Fix #57 and #58.