Try a fix #20