Fix of #58