Bug fix on ship indexing