Simplify to ease debugging