Fixed 'Bug 16844 - Convert class to static'