Fix Bug #8

issue #8