More attempts to fix #12