v6.1: fixes a issue on v6.0