this the bug-fix of commit https://review.openstack.org/#/c/368512 Change-Id: I3b91cec7621ae826ba9378e6039c54737f765d28