Make issue on object space regression on master #2046