to match my ccbin-server commit