- updated to fix issues with interceptors