First attempt to fix #19