Fix for #131