fixed caching issue #2