Fixing REM Bug (Temp)