Fixed 'Bug 20058 - Error while executing command: Resolve'.