resolve the bug introduced by pr #1