Introduce a bool to fix the bug

Fix #190