MVP-240 Fixed bug in complex types indexing