should this be ```@message.presence || super``` ?