Bug 1953 - Follow up fix on security patch