Fix for #160