FL-1536: adding workaround for the issue