rebuild for onServer work