Fix issue on ConstraintLimitHandler