Fixed nasty caching issue :grin: