code clean
fix issue #244