Moved call to ConvertLimits inside factory delegate