MANTA-42 restore assertions
MANTA-42 fix candidate indexing error
MANTA-45 proposed fix