Fix #53
Fix #52
Fix #17