* Attempt to fix #110 (not confirmed)