Fixes issue 2