Finding and fixing #1699