Fix of #4