Try fix #9