fix with the same output than before