fixing live vs normal mode