Fix bug introduced in ab23b9e (merge branch issue10)
Fix bug introduced in a9ffe3e (merge branch issue4)