Fix for #167
Fixed #167