Applied minimal change to allow code folding