more fix with realtime