fix #1140, fix for fix for fix of #1136