Re #1152 Fixing limit issues.