Moved to ensure client will run