Another bug fix. UAU
More more comments.