At some point a regression test should be added for #70/#20. Might be a little tricky though due to the nature of the issue.
