One last bit of optimization