#15 fix some problem caused by eclipse refactor