Fixed the issue #25