Libs/Functions: Changed index behavior