'Working...' Speed fix

Hi,

This update should fix issues with 'Working...' taking a long time.

Let me know if there are any issues.

Cheers,
Steve.