Fix #61, fix #62