Bug Fix - undefined authenticated index errors