Fix for amd64
