qnd: bug fixing