Trying to fix last remaining bug.