Cleaner fix for lightbox workflow problems.