Fixed issue with inconsistent fold behaviour