Fix for #139