Fix for ENTMQ-482.