A fix for #37.