Fix #149
Fix #150