Better message fix for output