Version 1.18: bug fix