amend 0.9.6