Fix bug introduced in last commits