further fixes for #1