qnd: bugs fixing