Rollback to version 2.1.7