Fix building - this change from master got merged wrongly