https://blazemeter.atlassian.net/browse/BPC-209 fix