REV-14 *fix assert