Fixed the 64bit issue