More tries to fix #2