ID-fix

The confusion here is exactly the reason why we need to do this better.
Final point in resolving #203