Fix commander it retrieved the wrong number of blocks