Fix for Bug #1180774 (Launchpad)