Delimiter bug fix