Fixes issue 3