Bug fixing. Issue #65.