possibly fix issue 538