fix issue #652 (Need to specify order explicitly)
fix issue #656
Merge pull request #657 from dimonzozo/v2.0.x

fix issue #652 (Need to specify order explicitly), #656