Fixed 64bit implementation