Fix of #33