fix #571
Merge branch '0.3.4-fix-571'