temporary fix for caching issue, added TODO