More attempts to fix #16.