Logic bug fix. attenmpt to support 64 (not tested)