Attempt to fix #214