Fixes issue #145 

This fixes issue #145