Another try to fix #15