added comments to explain the latest fix.