CWM Loop Fix

Thanks @shaaan