Try fix #2