First attempt to fix #192