Fix attempt.

see #610
Merge branch '1.1.x'