fixes issue 6