Back to 1.7.1 for bug fix