Fixing Issue03
Fixing issue 03