Fix for rm 2.5