I have no idea how it ever worked before this change