Fix for launchpad bug : 1324814