Fix regression for real this time -.-