issue#8 SOLVED