workaround for MPS-18577