Fix #46
Fix #28