@leolara Reviewing right now. Will fix and commit shortly, as necessary.