A new try to fix #15