Wait Bar Fix

Adds the fix for the wait bar problem mentioned before