BUG : Fixed problem issue #80