RESOLVE SESSION_START BUG -> DONE