Fix error issue #30