fix bug and add static class