Redid client to fix load order