fix from cmd 0.3