First attempt to fix #97