More on #811; tabs fixed