additional fixes for #15