Fixed Remarks bug