Issue 407 (slow `sentence`) fix