Bug 8063 - Followup - Bug fix