Fix for #81 for 2.2 as well