Added filter for \r