fix --no-subserver option