Attempt to resolve zixaphir/appchan-x#724