Temporary hack until count can be refreshed