Fixed 'Bug 16786 - Redundant unsafe wrong context'