fix issue 539