Fix to issue2
Immediate solution to issue2