Issue 439: be more lax and don't look for END