Fixed issue #181

Fixes issue #181