a17: bug fixed