Fixed issues with progress bar