Some small changes, but the bug is still there.