More on #505