Fixing the GOARMY work