Fixes issue 13