Yay bug fixing