fix #412 for 2.1