Guard 2 compatibility

Initial stab