Fix for locking issue (and hopefully the multiple run issue)