Fix for #141