fixes issue 13