Fixed indexing
21/11/14 Fixed index issues