Getting close to fixing this problem.