Uh, hopefully fixing some weird issue