guard and afterguard are being combined after which this will be fixed. This PR is no longer necessary