BUG : fixed bug issue #156