Fix for #158

Fix for #158