Hot Fix previous merge (#744).