Moved to #377, client loading properly