Fixes issue 5