Fix for #182

Fix for #182
Fix for #180

Fix for #180