Hopefully, this is the real fix for the lockup
