fix comprehensive unit conevrt