Prevent stuck progress dialog, but well done