Handle guards of different deparsed length
Reverted some logic