Re-added auth fix