RealtimeHandler fix (add comments)