MP-439 #comment Tweak