Minor bug fix in analogs