Fixes to make it actually work and cover the missed case.
https://github.com/WikiApiary/WikiApiary/issues/42