v1.0-fix6