fixed indexing..