Fixes issue 8.