Fix for #160

Fix for #160