a workaround commitwq