fix a big bug..