fixed bug at Issue #1