Version 3.11, fix #12