Move output message where it belongs