Unecessary work to fix this everywhere