A fix for #66