Fix for 64bit