Fix for #120