Fix issue w/ debug accounts