Fix error from merge with session-folder