Hopefully fixes timing issues