Fixed the bug in #22