Fixed with first solution