Fixed 'Bug 5687 - Quick fix for extension methods must be declared static'