Fix for #29.