Issue #64: fix the bug

closes #64