#28 - Fixing static class problem