more fuckup fixing