Fixes issue 9