added back hack cause it doesn't work well without it and i don't wanna dive into that atm