Working on this bug.