Version 3.3.6 with enforceLimit fix.