issue #148 Solved