Fix #54
Fix #53