Update for upstream bugfix