Hopefully fix this issue