fixes issue 3308