BugFix: Upper limit in set and get