Shit be fixed