Hopefully fix hanging?