Moved out of static class? Maybe that was why...