Feature #2572: Fix sample code output