Fix for #29