Working on issue mentioned by Babar Tariq