Fix of #19