Fix of #101