Fixed one problem, attempting to solve another