Bug 829455 - Now setting the correct option