Fix #147
Fix #146