Fixed bug..