actually fix this bug