Fixes issue 14