Fix for issue #87

This fixes issue 87