Fixed error https://bugs.launchpad.net/openstack-community/+bug/1181028
 Fixed error https://bugs.launchpad.net/openstack-community/+bug/1181028 (II)