Workaround to make this work, I'll deal with this later