additional fixes for #48