Fix for manual runs with data from DB