Possible fix for Uncarry