A fix for the first run