Fixed status message logic