Fix of #61