BugFix: Fixed ArgumentOutOfRangeException