Fixed regression (Refs: 18671092d6)