Fix for pang64 fail