Trying to fix #19