A temporary workaround for one of the issue-s symptoms (OMS-226)