Gerard fixing things hopefully