Backport #18 fix in 2.2 as well, just in case