@sescandell fixed on latest PR