Should fix bug when using -C