Bug Fix: reload on app switch