Fix #144
Fix #138