fix disk mapping better