[bug fixes] make nadd2013 is workable