Testing the change proposed by @cervengoc on #781