FIX#343 Bug fixed