Fixed issue 2328