v1.0-fix4