Issue 374: bug fixed