good catch, fixed it via `b37f7a8`!

is the rest of the PR reasonable to you?