- infinite loop here ? but how ?
- fixed logic test failure