Fixing issue 3 from Richa dated 09/08-14