Fix #2 (finally as I forgot…)