Removed out of index errors