dibyendumajumdar issue #2