Index Bug Fix