Resolve Guard deprecation warning