I have not found a workaround for this in QM18, but the development team is aware of the issue and I think understands the importance of getting it implemented soon.