Fix expression buffering bug