Fixes issue 179
Fixes issue 203