fix issue 3524