Fixed bug stuff