Partially fixed https://bugs.launchpad.net/openstack-community/+bug/1181025