Fixed Unreachable fields error. Fix #1585