Bug 4154 - Follow-up