Fix use of static class