Bug Fix: double events on app load