Merge #12 fix in 2.3 as well