Fix 64bit mode - references #582