Fixes for #146

Demonstrates bug in #146
Fix to come