Fixed caching issue
merge