Fix #183
Fix #185
Fix #188