Should fix non-intialized bugs from @Hamcha's system.