EXPERIMENTAL: First try on fixing RIL