shit be fixed