actually fix above bug