Think this has fixed database bug introduced by caching