fixing stuffZ