Fix yet another bug