Hopefully fix lockup issues