release candidate 18, fix #20