Fixed potential builtin class design flaw.