Fixing issue 117

This should fix #117