Fix sign problem and further simplify 5.15