Issue no. 5 - solved