fixed bug..again!