0.2-RC6, fix #15