Attempted fix + More debug messages