Fixed local-only issue assumption