additional fixes for #14