added workaround for MQENT-223