Bug Fix: Stuck Pages