Fix of #37
Fix of #37, small mistake fix