Almost fix it