Fix https://bugs.launchpad.net/openstack-community/+bug/1182566