Try to fix a bug..