fix issue 1229