issue 2586: fixing mistakes related to previous commit