One more shot at fixing this class reference issue