Amend previous commit. Fix #62