Attempt to fix UnsupportedMethodException from graph