Fix of #54