Fixup by using the good num_step used and using DisconnectedType instead of zeros (This change what was requested), remove +1. Test another corner case.