fix a regression caused in RM 2.20+