fix the issue #40