Changed parsing behavior for delete case