fixed v6.1