switch back to proper CRTP