bug fixed yay