Fixed the issue #29