fix https://osslab.atlassian.net/browse/LAB-134