This still isn't great but this fixes a bug