BUG FIX - Attempt to resolve the crash after changing tabs