Fixed again, this time for real