added a few comments to explain this temporary fix