changes for a quick fix of caching error