Fix #182
Fix #180