refactoring....
fix stable 0.3