This is to ytake care of issue #2