AAI: additional assert / fix param type