Bug fixing. Issue #66