More on #488