- Update for further fixes for #557.