6781ecd02e
This simplifies some of the internal logic and ensures it is a bit more robust
This simplifies some of the internal logic and ensures it is a bit more robust