Note: I've only tested that it compiles, not verified that it resolves the issue, so if whoever had this problem could try it that'd be good.
