minor enhancement on pure api