Added automatic rem fallback functionality