Possible fix for issue with emwait.