Fix bug 1098311

Cherry picked from https://review.openstack.org/#/c/26302/

Change-Id: Id68f39f8ca5209253c755dae483a74ceceebe1bb