fix issue 499