Fix for global running