[Fix] Gerard is less drunk now