Fixes issue 17