Fix Whole Rest Issue