QS-2373 workaround added.