FEND-934 tweaked output