Fix bug https://bugs.launchpad.net/neutron/+bug/1241602