Fixes #116 

Re-submittal of fix for #116