fixed bug stuff