Fix for caching zero